Merge "Added support to print atom annotation via print-logs"