Patches for long long support for check_swap on release 1.3 [sf#1153148] [#421]