Added fix to avoid shifting of Python comments
Merge fix